Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 9 Jul 2010 12:11:05 +0000 (12:11 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 9 Jul 2010 12:11:05 +0000 (12:11 +0000)
commitdc4bb57311a841fae5b5a524c613c890a45dcbeb
tree56146f4317ce7895bf7ef1ceb371309d9dbba99b
parentca0223dd3a016132a24021954e2907f4d1c0319d
parent09c07edf073e1e63b0c70d5c96429fe99d06f479
Merge from mainline.